Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:51:04 +0000 (08:51 -0500)
committerRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:51:04 +0000 (08:51 -0500)

Trivial merge